From b9cb9bd474bcc765bb0ed9cad919631b2b877d10 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Sun, 29 Jul 2007 10:12:21 +0000 Subject: [PATCH] (__malloc_initialize): Remove pthread_once. Not needed. --- src/gmalloc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gmalloc.c b/src/gmalloc.c index fcd9f655321..cf79b9159f2 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -561,7 +561,6 @@ register_heapinfo () } #ifdef USE_PTHREAD -static pthread_once_t malloc_init_once_control = PTHREAD_ONCE_INIT; pthread_mutex_t _malloc_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t _aligned_blocks_mutex = PTHREAD_MUTEX_INITIALIZER; #endif @@ -607,18 +606,16 @@ malloc_initialize_1 () return; } -/* Set everything up and remember that we have. */ +/* Set everything up and remember that we have. + main will call malloc which calls this function. That is before any threads + or signal handlers has been set up, so we don't need thread protection. */ int __malloc_initialize () { -#ifdef USE_PTHREAD - pthread_once (&malloc_init_once_control, malloc_initialize_1); -#else if (__malloc_initialized) return 0; malloc_initialize_1 (); -#endif return __malloc_initialized; } -- 2.30.2